rails 4 defaulted this on, making mysql complain on bad encoding
Andrew Cantino
2 changed files with 4 additions and 1 deletions
+ 1
- 1
app/models/agent_log.rb
@@ -35,7 +35,7 @@ class AgentLog < ActiveRecord::Base |
||
| 35 | 35 |
protected |
| 36 | 36 |
|
| 37 | 37 |
def scrub_message |
| 38 |
- if message_changed? |
|
| 38 |
+ if message_changed? && !message.nil? |
|
| 39 | 39 |
self.message = message.inspect unless message.is_a?(String) |
| 40 | 40 |
self.message.scrub!{ |bytes| "<#{bytes.unpack('H*')[0]}>" }
|
| 41 | 41 |
end |
+ 3
- 0
config/database.yml
@@ -9,6 +9,7 @@ development: |
||
| 9 | 9 |
host: <%= ENV['DATABASE_HOST'] || "" %> |
| 10 | 10 |
port: <%= ENV['DATABASE_PORT'] || "" %> |
| 11 | 11 |
socket: <%= ENV['DATABASE_SOCKET'] || ["/var/run/mysqld/mysqld.sock", "/opt/local/var/run/mysql5/mysqld.sock", "/tmp/mysql.sock"].find { |path| File.exist? path } %>
|
| 12 |
+ strict: false |
|
| 12 | 13 |
|
| 13 | 14 |
# Warning: The database defined as "test" will be erased and |
| 14 | 15 |
# re-generated from your development database when you run "rake". |
@@ -23,6 +24,7 @@ test: |
||
| 23 | 24 |
password: <%= ENV['DATABASE_PASSWORD'].presence || "" %> |
| 24 | 25 |
socket: <%= ENV['DATABASE_SOCKET'] || ["/var/run/mysqld/mysqld.sock", "/opt/local/var/run/mysql5/mysqld.sock", "/tmp/mysql.sock"].find { |path| File.exist? path } %>
|
| 25 | 26 |
port: <%= ENV['DATABASE_PORT'] || "" %> |
| 27 |
+ strict: false |
|
| 26 | 28 |
|
| 27 | 29 |
production: |
| 28 | 30 |
adapter: <%= ENV['DATABASE_ADAPTER'].presence || "mysql2" %> |
@@ -35,3 +37,4 @@ production: |
||
| 35 | 37 |
host: <%= ENV['DATABASE_HOST'] || "" %> |
| 36 | 38 |
port: <%= ENV['DATABASE_PORT'] || "" %> |
| 37 | 39 |
socket: <%= ENV['DATABASE_SOCKET'] || ["/var/run/mysqld/mysqld.sock", "/opt/local/var/run/mysql5/mysqld.sock", "/tmp/mysql.sock"].find{ |path| File.exist? path } %>
|
| 40 |
+ strict: false |